Skip to content

[tree] In TBasket/TBranch, error out if reading oob in the streamer#22165

Merged
silverweed merged 3 commits into
root-project:masterfrom
silverweed:tbasket_read_oob
Jun 17, 2026
Merged

[tree] In TBasket/TBranch, error out if reading oob in the streamer#22165
silverweed merged 3 commits into
root-project:masterfrom
silverweed:tbasket_read_oob

Conversation

@silverweed

@silverweed silverweed commented May 6, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

TODO

  • add tests
  • verify if we can just ignore fNevBufSize and pass nullptr to ReadArray or if we should rather check that they match

Checklist:

  • tested changes locally
  • updated the docs (if necessary)

This PR fixes #22164

@silverweed silverweed self-assigned this May 6, 2026
@silverweed silverweed requested a review from jblomer May 6, 2026 15:42
@github-actions

github-actions Bot commented May 6, 2026 •
edited
Loading

Copy link
Copy Markdown

Test Results

    22 files      22 suites   3d 23h 2m 38s ⏱️
 3 865 tests  3 828 ✅   0 💤 37 ❌
77 251 runs  77 089 ✅ 125 💤 37 ❌

For more details on these failures, see this check.

Results for commit e230663.

♻️ This comment has been updated with latest results.

@silverweed silverweed marked this pull request as ready for review May 7, 2026 11:40
pcanal
pcanal reviewed May 7, 2026
View reviewed changes
Comment thread tree/tree/src/TBranch.cxx Outdated
pcanal
pcanal reviewed May 7, 2026
View reviewed changes
Comment thread tree/tree/src/TBasket.cxx Outdated
@silverweed silverweed force-pushed the tbasket_read_oob branch 2 times, most recently from 5dd55ea to d34cef1 Compare May 11, 2026 07:52
pcanal
pcanal reviewed May 18, 2026
View reviewed changes
Comment thread tree/tree/src/TBasket.cxx
pcanal
pcanal reviewed May 18, 2026
View reviewed changes
Comment thread tree/tree/src/TBasket.cxx Outdated
pcanal
pcanal reviewed May 18, 2026
View reviewed changes
Comment thread tree/tree/src/TBasket.cxx
pcanal
pcanal reviewed May 18, 2026
View reviewed changes
Comment thread tree/tree/src/TBranch.cxx Outdated
@silverweed silverweed added this to the 6.40.02 milestone May 19, 2026
@silverweed silverweed force-pushed the tbasket_read_oob branch 3 times, most recently from d7fb593 to c789f0f Compare May 19, 2026 13:34
pcanal
pcanal reviewed May 19, 2026
View reviewed changes
Comment thread tree/tree/src/TBasket.cxx Outdated
pcanal
pcanal reviewed May 19, 2026
View reviewed changes
Comment thread tree/tree/src/TBasket.cxx Outdated
pcanal
pcanal approved these changes May 19, 2026
View reviewed changes

@pcanal pcanal left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks.

@dpiparo dpiparo modified the milestones: 6.40.02, 6.40.04 Jun 9, 2026
@silverweed silverweed force-pushed the tbasket_read_oob branch 2 times, most recently from cb8205e to 3bde1a6 Compare June 10, 2026 07:05
pcanal
pcanal reviewed Jun 11, 2026
View reviewed changes
Comment thread tree/tree/src/TBasket.cxx Outdated
pcanal
pcanal reviewed Jun 11, 2026
View reviewed changes
Comment thread tree/tree/src/TBasket.cxx Outdated
@silverweed silverweed merged commit aa344c0 into root-project:master Jun 17, 2026
55 of 58 checks passed
@silverweed silverweed deleted the tbasket_read_oob branch June 17, 2026 08:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pcanal pcanal pcanal approved these changes

@jblomer jblomer Awaiting requested review from jblomer jblomer is a code owner

@bellenot bellenot Awaiting requested review from bellenot bellenot is a code owner

@dpiparo dpiparo Awaiting requested review from dpiparo dpiparo is a code owner

Assignees

@silverweed silverweed

Labels

bug in:I/O in:TTree

Projects

None yet

Milestone

6.40.04

Development

Successfully merging this pull request may close these issues.

[tree] Heap buffer overflow in TBasket::Streamer when reading TTree baskets with mismatched fNevBufSize and on-disk array length

3 participants

@silverweed @pcanal @dpiparo